Streamline config in bootstrap #144807

Shourya742 · 2025-08-02T06:13:52Z

This PR restructures the config module to improve readability and debuggability. It also aims to eliminate as many invariants as possible. Best reviewed commit by commit.

r? @Kobzol

…te functions

rustbot · 2025-08-02T06:13:58Z

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

Kobzol

I would stop before eb81f72 in this PR, it already has a lot of changes. Left some comments. Looks great!

src/bootstrap/src/core/config/config.rs

Kobzol

Oh, GH doesn't send notifications for PRs being marked as ready to review, annoying as always. Found one thing.

src/bootstrap/src/core/config/config.rs

Kobzol · 2025-08-06T06:42:57Z

src/bootstrap/src/core/config/config.rs

@@ -977,11 +1163,90 @@ impl Config {
            config.channel = channel;


This override is applied after config.channel has already been read.. but it seems to be pre-existing, not sure if it was intended though. Let's leave it like it is for now.

Kobzol · 2025-08-06T10:58:25Z

Thanks, looks good now. You can r=me once CI is green.

@bors delegate+

bors · 2025-08-06T10:58:28Z

✌️ @Shourya742, you can now approve this pull request!

If @Kobzol told you to "r=me" after making some further change, please make that change, then do @bors r=@Kobzol

Shourya742 · 2025-08-06T11:38:12Z

@bors r=@Kobzol

bors · 2025-08-06T11:38:15Z

📌 Commit 962836d has been approved by Kobzol

It is now in the queue for this repository.

Shourya742 added 26 commits August 1, 2025 20:26

move gcc config parsing to parse_inner

f95edbe

move dist to parse_inner

3f9bf57

move target parsing to parse_inner

924912c

move install to parse_inner

89219ff

move llvm parsing to parse_inner

3248ff1

move rust config to parse_inner

ddd2a54

Force initializing ExecutionContext with verbosity and fail_fast mode

ae05591

Extract TOML config loading and src directory computation into separa…

82756fd

…te functions

Split TOML postprocessing into a separate function

f89ea08

Override some build TOML values by flags

cfc40de

Fix logging of config skip values

8652d96

Fix verbosity setting

58a38cd

add install default implementation

222dfcc

add gcc and dist default implementation

bbe7c08

add llvm default implementation

38ddefa

add rust default implementation

8b80cb0

make llvm toml fields follow a specific naming convention

d3d3b10

make gcc toml fields follow a specific naming convention

c008a4b

make dist toml fields follow a specific naming convention

4d2a2c2

make install toml fields follow a specific naming convention

ad98550

make build toml fields follow a specific naming convention

2c96132

move build config to the top of parse method

a75326b

move install config to the top of parse method

39d9cf7

move rust config to the top of parse method

120d93e

move llvm config to the top of parse method

f74f1a0

move dist and gcc config to the top of parse method

7f20ad8

rustbot assigned Kobzol Aug 2, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Aug 2, 2025

Shourya742 marked this pull request as draft August 2, 2025 06:14

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 2, 2025